fix: use Long_val for sendfile() parameters to fix file copying in docker
#10333
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tonyfettes
changed the title
Long_val for sendfile() parameters to fix file copying in docker
tonyfettes
force-pushed
the
main
branch
2 times, most recently
from
854b501 to
2acf653
Compare
|
Thanks, I'll try to test this. |
emillon
added a commit
to emillon/dune
that referenced
this pull request
Mar 29, 2024
See ocaml#10333 Signed-off-by: Etienne Millon <me@emillon.org>
|
@dra27 does this look ok or are there any considerations for using |
rgrinberg
approved these changes
Mar 29, 2024
anmonteiro
approved these changes
Mar 29, 2024
tonyfettes
force-pushed
the
main
branch
3 times, most recently
from
9333e0f to
a7f3665
Compare
emillon
added a commit
to emillon/dune
that referenced
this pull request
Apr 2, 2024
See ocaml#10333 Signed-off-by: Etienne Millon <me@emillon.org>
emillon
added a commit
that referenced
this pull request
Apr 2, 2024
See #10333 Signed-off-by: Etienne Millon <me@emillon.org>
Signed-off-by: Haoxiang Fei <feihaoxiang2014@gmail.com>
Co-authored-by: Etienne Millon <etienne.millon@gmail.com> Signed-off-by: Haoxiang Fei <tonyfettes@tonyfettes.com>
Signed-off-by: Etienne Millon <me@emillon.org>
Signed-off-by: Etienne Millon <me@emillon.org>
|
This will fix files over 4GB on 64-bit systems, but it will still overflow on 32-bit systems. It's a slightly confusingly-named macro, but The only way to fix this for 32-bit systems is to use an I'm not sure how much that level of 32-bit support really matters for Dune, though? |
|
Yes, there's no need to bother 32 bit support for dune itself. |
pmwhite
pushed a commit
to pmwhite/dune
that referenced
this pull request
Apr 2, 2024
See ocaml#10333 Signed-off-by: Etienne Millon <me@emillon.org>
pmwhite
pushed a commit
to pmwhite/dune
that referenced
this pull request
Apr 2, 2024
…docker (ocaml#10333) * fix: sendfile() in docker Signed-off-by: Haoxiang Fei <feihaoxiang2014@gmail.com> * use ssize_t for return value Co-authored-by: Etienne Millon <etienne.millon@gmail.com> Signed-off-by: Haoxiang Fei <tonyfettes@tonyfettes.com> * update test Signed-off-by: Etienne Millon <me@emillon.org> * Add changelog Signed-off-by: Etienne Millon <me@emillon.org> --------- Signed-off-by: Haoxiang Fei <feihaoxiang2014@gmail.com> Signed-off-by: Haoxiang Fei <tonyfettes@tonyfettes.com> Signed-off-by: Etienne Millon <me@emillon.org> Co-authored-by: Etienne Millon <etienne.millon@gmail.com> Co-authored-by: Etienne Millon <me@emillon.org>
This was referenced Apr 17, 2024
emillon
added a commit
to emillon/dune
that referenced
this pull request
Apr 17, 2024
See ocaml#10333 Signed-off-by: Etienne Millon <me@emillon.org>
emillon
added a commit
to emillon/dune
that referenced
this pull request
Apr 17, 2024
…docker (ocaml#10333) * fix: sendfile() in docker Signed-off-by: Haoxiang Fei <feihaoxiang2014@gmail.com> * use ssize_t for return value Co-authored-by: Etienne Millon <etienne.millon@gmail.com> Signed-off-by: Haoxiang Fei <tonyfettes@tonyfettes.com> * update test Signed-off-by: Etienne Millon <me@emillon.org> * Add changelog Signed-off-by: Etienne Millon <me@emillon.org> --------- Signed-off-by: Haoxiang Fei <feihaoxiang2014@gmail.com> Signed-off-by: Haoxiang Fei <tonyfettes@tonyfettes.com> Signed-off-by: Etienne Millon <me@emillon.org> Co-authored-by: Etienne Millon <etienne.millon@gmail.com> Co-authored-by: Etienne Millon <me@emillon.org>
emillon
added a commit
to emillon/dune
that referenced
this pull request
Apr 17, 2024
See ocaml#10333 Signed-off-by: Etienne Millon <me@emillon.org>
emillon
added a commit
to emillon/dune
that referenced
this pull request
Apr 17, 2024
…docker (ocaml#10333) * fix: sendfile() in docker Signed-off-by: Haoxiang Fei <feihaoxiang2014@gmail.com> * use ssize_t for return value Co-authored-by: Etienne Millon <etienne.millon@gmail.com> Signed-off-by: Haoxiang Fei <tonyfettes@tonyfettes.com> * update test Signed-off-by: Etienne Millon <me@emillon.org> * Add changelog Signed-off-by: Etienne Millon <me@emillon.org> --------- Signed-off-by: Haoxiang Fei <feihaoxiang2014@gmail.com> Signed-off-by: Haoxiang Fei <tonyfettes@tonyfettes.com> Signed-off-by: Etienne Millon <me@emillon.org> Co-authored-by: Etienne Millon <etienne.millon@gmail.com> Co-authored-by: Etienne Millon <me@emillon.org>
emillon
added a commit
to emillon/dune
that referenced
this pull request
Apr 17, 2024
See ocaml#10333 Signed-off-by: Etienne Millon <me@emillon.org>
emillon
added a commit
to emillon/dune
that referenced
this pull request
Apr 17, 2024
…docker (ocaml#10333) * fix: sendfile() in docker Signed-off-by: Haoxiang Fei <feihaoxiang2014@gmail.com> * use ssize_t for return value Co-authored-by: Etienne Millon <etienne.millon@gmail.com> Signed-off-by: Haoxiang Fei <tonyfettes@tonyfettes.com> * update test Signed-off-by: Etienne Millon <me@emillon.org> * Add changelog Signed-off-by: Etienne Millon <me@emillon.org> --------- Signed-off-by: Haoxiang Fei <feihaoxiang2014@gmail.com> Signed-off-by: Haoxiang Fei <tonyfettes@tonyfettes.com> Signed-off-by: Etienne Millon <me@emillon.org> Co-authored-by: Etienne Millon <etienne.millon@gmail.com> Co-authored-by: Etienne Millon <me@emillon.org>
emillon
added a commit
that referenced
this pull request
Apr 17, 2024
* test: demonstrate overflow with sendfile (#10334) See #10333 Signed-off-by: Etienne Millon <me@emillon.org> * fix: use `Long_val` for sendfile() parameters to fix file copying in docker (#10333) * fix: sendfile() in docker Signed-off-by: Haoxiang Fei <feihaoxiang2014@gmail.com> * use ssize_t for return value Co-authored-by: Etienne Millon <etienne.millon@gmail.com> Signed-off-by: Haoxiang Fei <tonyfettes@tonyfettes.com> * update test Signed-off-by: Etienne Millon <me@emillon.org> * Add changelog Signed-off-by: Etienne Millon <me@emillon.org> --------- Signed-off-by: Haoxiang Fei <feihaoxiang2014@gmail.com> Signed-off-by: Haoxiang Fei <tonyfettes@tonyfettes.com> Signed-off-by: Etienne Millon <me@emillon.org> Co-authored-by: Etienne Millon <etienne.millon@gmail.com> Co-authored-by: Etienne Millon <me@emillon.org> * fix formatting (#10356) Signed-off-by: Etienne Millon <me@emillon.org> * move changelog entry to the right place (#10375) Signed-off-by: Etienne Millon <me@emillon.org> --------- Signed-off-by: Etienne Millon <me@emillon.org> Signed-off-by: Haoxiang Fei <feihaoxiang2014@gmail.com> Signed-off-by: Haoxiang Fei <tonyfettes@tonyfettes.com> Co-authored-by: Haoxiang Fei <tonyfettes@tonyfettes.com>
emillon
added a commit
to emillon/opam-repository
that referenced
this pull request
Apr 17, 2024
CHANGES: ### Fixed - Fix overflow in sendfile stubs (copy of large files could fail or end with truncated files) (ocaml/dune#10333, @tonyfettes) - Fix crash when a rule with a directory target is disabled with `enabled_if` (ocaml/dune#10382, fixes ocaml/dune#10310, @gridbugs) - melange: remove all restrictions around virtual libraries in Melange. They may be used as otherwise in libraries and executables. (ocaml/dune#10412, @anmonteiro) - spawn: fix compatibility with RHEL7 (ocaml/dune#10428, @emillon)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I was using dune in docker, and every it copies some large file in a data_only_dirs it reports that
sendfile: No such file or directory. I tried digging into the source and I think converting the ocaml integer to 32-bit version will make it impossible to copy any file that is larger than 4 GB. I have tested in a docker, but I cannot really confirm whether it really works on real linux machine (I'm using macOS).